(kill-new): Don't try to setcar kill-ring if it is

nil.

diff --git a/lisp/simple.el b/lisp/simple.el
index 2158d35891c1196a729823fe1d09d655f29df07d..aded4e0650dbf1a2644f513f949dcb52c5de0223 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1668,7 +1668,7 @@ Optional second argument REPLACE non-nil means that STRING will replace
 the front of the kill ring, rather than being added to the list."
   (and (fboundp 'menu-bar-update-yank-menu)
        (menu-bar-update-yank-menu string (and replace (car kill-ring))))
-  (if replace
+  (if (and replace kill-ring)
       (setcar kill-ring string)
     (setq kill-ring (cons string kill-ring))
     (if (> (length kill-ring) kill-ring-max)